bitkeeper revision 1.1159.189.5 (41a4df43-1oRwflRup-Lv0_uV9XxdQ)

sync w/ head.

diff --git a/xen/arch/x86/x86_32/entry.S b/xen/arch/x86/x86_32/entry.S
index 623e0961bbba422539645586eaab0e9fc63da936..ad6477f7a8f7702fcabf133ce71b8ffb1c3c5b45 100644 (file)
--- a/xen/arch/x86/x86_32/entry.S
+++ b/xen/arch/x86/x86_32/entry.S
@@ -96,7 +96,7 @@ do_multicall:
 multicall_loop:
         pushl %ecx
         movl  4(%esp),%ecx               # %ecx = struct domain
-        movl  DOMAIN_processor(%ecx),%eax
+        movl  EDOMAIN_processor(%ecx),%eax
         shl   $6,%eax                    # sizeof(irq_cpustat) == 64
         testl $~0,SYMBOL_NAME(irq_stat)(%eax,1)
         jnz   multicall_preempt

diff --git a/xen/common/dom_mem_ops.c b/xen/common/dom_mem_ops.c
index cf5ade9025364249cdf6f7dcbc634124e7747e82..521d1a125834f633d9db1e088bc6ab8c7c965092 100644 (file)
--- a/xen/common/dom_mem_ops.c
+++ b/xen/common/dom_mem_ops.c
@@ -39,7 +39,7 @@ static long alloc_dom_mem(struct domain *d,
             __HYPERVISOR_dom_mem_op, 5,
             MEMOP_increase_reservation,
             &extent_list[i], nr_extents-i, extent_order,
-            (d == current) ? DOMID_SELF : d->id);
+            (d == current->domain) ? DOMID_SELF : d->id);
 
         if ( unlikely((page = alloc_domheap_pages(d, extent_order)) == NULL) )
         {
@@ -73,7 +73,7 @@ static long free_dom_mem(struct domain *d,
             __HYPERVISOR_dom_mem_op, 5,
             MEMOP_decrease_reservation,
             &extent_list[i], nr_extents-i, extent_order,
-            (d == current) ? DOMID_SELF : d->id);
+            (d == current->domain) ? DOMID_SELF : d->id);
 
         if ( unlikely(__get_user(mpfn, &extent_list[i]) != 0) )
             return i;